From: tsteven4 Date: Sat, 16 Mar 2019 20:59:00 +0000 (-0600) Subject: update Qt 5.12 builds to 5.12.2. (#329) X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~15 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=473c2ec748738e51d650f6af5dcbca346c36b020;p=gpsbabel.git update Qt 5.12 builds to 5.12.2. (#329) * update Qt 5.12 builds to 5.12.2. * update coverage reporter, kill java8 in docker, add bear. --- diff --git a/.travis.yml b/.travis.yml index eed6b17df..6b498d95a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ matrix: timeout: 600 - os: osx compiler: clang - env: QT_VERSION="5.12.1" + env: QT_VERSION="5.12.2" cache: directories: - $HOME/Cache diff --git a/tools/Dockerfile b/tools/Dockerfile index e2031e459..fda020633 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ valgrind \ expat \ libxml2-utils \ + bear \ && rm -rf /var/lib/apt/lists/* # alternative compiler @@ -44,6 +45,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # pkgs with libraries needed by gpsbabel RUN apt-get update && apt-get install -y --no-install-recommends \ libusb-dev \ + pkg-config \ + libudev-dev \ && rm -rf /var/lib/apt/lists/* # pkgs with qt used by gpsbabel @@ -57,7 +60,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # pkgs needed to generate coverage report: RUN apt-get update && apt-get install -y --no-install-recommends \ gcovr \ - openjdk-8-jre-headless \ && rm -rf /var/lib/apt/lists/* # install environment for locale test diff --git a/tools/Dockerfile_qtio b/tools/Dockerfile_qtio index dc478d78d..084c8e195 100644 --- a/tools/Dockerfile_qtio +++ b/tools/Dockerfile_qtio @@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # basic build and test tools COPY ./qtci/install-qt ./qtci/extract-qt-installer /app/ -RUN QT_CI_PACKAGES=qt.qt5.5121.gcc_64,qt.qt5.5121.qtwebengine QT_CI_DOWNLOADER="wget -nv -c" PATH=/app:${PATH} ./install-qt 5.12.1 /opt +RUN QT_CI_PACKAGES=qt.qt5.5122.gcc_64,qt.qt5.5122.qtwebengine QT_CI_DOWNLOADER="wget -nv -c" PATH=/app:${PATH} ./install-qt 5.12.2 /opt FROM ubuntu:bionic LABEL maintainer="https://github.com/tsteven4" @@ -49,6 +49,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ valgrind \ expat \ libxml2-utils \ + bear \ && rm -rf /var/lib/apt/lists/* # alternative compiler @@ -67,6 +68,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # pkgs with libraries needed by gpsbabel RUN apt-get update && apt-get install -y --no-install-recommends \ libusb-dev \ + pkg-config \ + libudev-dev \ && rm -rf /var/lib/apt/lists/* # dependencies of Qt @@ -80,14 +83,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* # Qt -COPY --from=qt_install /opt/qt-5.12.1.env /opt/qtio.env -COPY --from=qt_install /opt/Qt/5.12.1 /opt/Qt/5.12.1 +COPY --from=qt_install /opt/qt-5.12.2.env /opt/qtio.env +COPY --from=qt_install /opt/Qt/5.12.2 /opt/Qt/5.12.2 COPY --from=qt_install /opt/Qt/Licenses /opt/Qt/Licenses # pkgs needed to generate coverage report: RUN apt-get update && apt-get install -y --no-install-recommends \ gcovr \ - openjdk-8-jre-headless \ && rm -rf /var/lib/apt/lists/* # install environment for locale test diff --git a/tools/make_windows_release.ps1 b/tools/make_windows_release.ps1 index 8a75af62f..b91d2c60c 100755 --- a/tools/make_windows_release.ps1 +++ b/tools/make_windows_release.ps1 @@ -31,7 +31,7 @@ New-Item "$($gpsbabel_build_dir)" -type directory -force | Out-Null Set-Location "$($gpsbabel_build_dir)" switch ($flow) { "mingw" { qmake "$($gpsbabel_src_dir)\GPSBabel.pro" -spec "win32-g++" } - # work around Qt 5.12.1 qmake bug. + # work around Qt 5.12.1, 5.12.2 qmake bug. #C:\Qt\5.12.1\msvc2017\bin\qmake.exe -tp vc GPSBabel.pro #WARNING: Could not parse Compiler option '-std:c++14'; added to AdditionalOptions. #WARNING: You can suppress these warnings with CONFIG+=suppress_vcproj_warnings. diff --git a/tools/travis_install_linux_coverage b/tools/travis_install_linux_coverage index 479740339..1eee42d85 100755 --- a/tools/travis_install_linux_coverage +++ b/tools/travis_install_linux_coverage @@ -27,7 +27,7 @@ function validate() { ) } -QT_VERSION=${1:-5.12.1} +QT_VERSION=${1:-5.12.2} QT_VERSION_SHORT=${QT_VERSION//./} # our expectation is that install-qt creates $QTDIR, $QTDIR/bin. diff --git a/tools/travis_install_linux_local b/tools/travis_install_linux_local index bf4fc21d6..359a42cf6 100755 --- a/tools/travis_install_linux_local +++ b/tools/travis_install_linux_local @@ -27,7 +27,7 @@ function validate() { ) } -QT_VERSION=${1:-5.12.1} +QT_VERSION=${1:-5.12.2} QT_VERSION_SHORT=${QT_VERSION//./} # our expectation is that install-qt creates $QTDIR, $QTDIR/bin. diff --git a/tools/travis_install_osx b/tools/travis_install_osx index dc9301538..fa0a8dc93 100755 --- a/tools/travis_install_osx +++ b/tools/travis_install_osx @@ -27,7 +27,7 @@ function validate() { ) } -QT_VERSION=${1:-5.12.1} +QT_VERSION=${1:-5.12.2} QT_VERSION_SHORT=${QT_VERSION//./} # our expectation is that install-qt creates $QTDIR, $QTDIR/bin. diff --git a/tools/travis_script_linux_coverage b/tools/travis_script_linux_coverage index 15d9924cc..eabc4fa2e 100755 --- a/tools/travis_script_linux_coverage +++ b/tools/travis_script_linux_coverage @@ -4,6 +4,7 @@ # extra ubuntu bionic packages: gcovr, openjdk-8-jre-headless, /usr/lib/jvm/java-8-openjdk-amd64/bin/java # as of 6/18/2018 you must use java 8, see issue #76, #83 at https://github.com/codacy/codacy-coverage-reporter/issues +# as of 3/16/2019 with coverage reporter 4.0.3 java 8 is not required. qmake make coverage @@ -16,8 +17,8 @@ make coverage #!!!!!!!!!!!!!!!!!!!!!!!!!!!! if [ -v CODACY_PROJECT_TOKEN ] ; then # upload coverate report to codacy. - wget -nv -c https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.3/codacy-coverage-reporter-4.0.3-assembly.jar - java -jar codacy-coverage-reporter-4.0.3-assembly.jar report -l cpp -f -r gpsbabel_coverage.xml + wget -nv -c https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.5/codacy-coverage-reporter-4.0.5-assembly.jar + java -jar codacy-coverage-reporter-4.0.5-assembly.jar report -l cpp -f -r gpsbabel_coverage.xml else echo "Skipping codacy coverage upload as CODACY_PROJECT_TOKEN is not set." fi